Autogenerated HTML docs for v1.8.1.2-526-gf51a7
diff --git a/RelNotes/1.8.1.3.txt b/RelNotes/1.8.1.3.txt new file mode 100644 index 0000000..03bd330 --- /dev/null +++ b/RelNotes/1.8.1.3.txt
@@ -0,0 +1,28 @@ +Git 1.8.1.3 Release Notes +========================= + +Fixes since v1.8.1.2 +-------------------- + + * The attribute mechanism didn't allow limiting attributes to be + applied to only a single directory itself with "path/" like the + exclude mechanism does. The fix for this in 1.8.1.2 had + performance degradations. + + * Command line completion code was inadvertently made incompatible with + older versions of bash by using a newer array notation. + + * We used to stuff "user@" and then append what we read from + /etc/mailname to come up with a default e-mail ident, but a bug + lost the "user@" part. + + * "git am" did not parse datestamp correctly from Hg generated patch, + when it is run in a locale outside C (or en). + + * Attempt to "branch --edit-description" an existing branch, while + being on a detached HEAD, errored out. + + * "git rebase --preserve-merges" lost empty merges in recent versions + of Git. + +Also contains various documentation fixes.
diff --git a/RelNotes/1.8.2.txt b/RelNotes/1.8.2.txt index aa3c1ea..a1ebb96 100644 --- a/RelNotes/1.8.2.txt +++ b/RelNotes/1.8.2.txt
@@ -58,6 +58,16 @@ always interpreted as a pathspec; "git cmd -- :/" is no longer needed, you can just say "git cmd :/". + * Various "hint" lines Git gives when it asks the user to edit + messages in the editor are commented out with '#' by default. The + core.commentchar configuration variable can be used to customize + this '#' to a different character. + + * "git add -u" and "git add -A" without pathspec issues warning to + make users aware that they are only operating on paths inside the + subdirectory they are in. Use ":/" (everything from the top) or + "." (everything from the $cwd) to disambiguate. + * "git blame" (and "git diff") learned the "--no-follow" option. * "git check-ignore" command to help debugging .gitignore files has @@ -92,6 +102,10 @@ * "git push" now requires "-f" to update a tag, even if it is a fast-forward, as tags are meant to be fixed points. + * Error messages from "git push" when it stops to prevent remote refs + from getting overwritten by mistake have been improved to explain + various situations separately. + * "git push" will stop without doing anything if the new "pre-push" hook exists and exits with a failure. @@ -121,7 +135,8 @@ * A new remote helper to interact with bzr has been added to contrib/. * "git p4" got various bugfixes around its branch handling. It is - also made usable with Python 2.4/2.5. + also made usable with Python 2.4/2.5. In addition, its various + portability issues for Cygwin have been addressed. * The remote helper to interact with Hg in contrib/ has seen a few fixes. @@ -198,7 +213,7 @@ attempt to kill a process spawned in the editor that was in turn launched by Git with SIGINT (or SIGQUIT), as Git would catch that signal and die. We ignore these signals now. - (merge 1250857 pf/editor-ignore-sigint later to maint). + (merge 0398fc34 pf/editor-ignore-sigint later to maint). * A child process that was killed by a signal (e.g. SIGINT) was reported in an inconsistent way depending on how the process was @@ -210,18 +225,15 @@ * We used to stuff "user@" and then append what we read from /etc/mailname to come up with a default e-mail ident, but a bug lost the "user@" part. - (merge dc342a2 jn/do-not-drop-username-when-reading-from-etc-mailname later to maint). * The attribute mechanism didn't allow limiting attributes to be applied to only a single directory itself with "path/" like the exclude mechanism does. The initial implementation of this that was merged to 'maint' and 1.8.1.2 was with a severe performance degradations and needs to merge a fix-up topic. - (merge 9db9eec nd/fix-directory-attrs-off-by-one later to maint). * "git am" did not parse datestamp correctly from Hg generated patch, when it is run in a locale outside C (or en). - (merge 5185b97 dl/am-hg-locale later to maint). * "git apply" misbehaved when fixing whitespace breakages by removing excess trailing blank lines. @@ -232,9 +244,12 @@ * "git archive" did not record uncompressed size in the header when streaming a zip archive, which confused some implementations of unzip. + * "git archive" did not parse configuration values in tar.* namespace + correctly. + (merge b3873c3 jk/config-parsing-cleanup later to maint). + * Attempt to "branch --edit-description" an existing branch, while being on a detached HEAD, errored out. - (merge 75135b2 nd/edit-branch-desc-while-detached later to maint). * "git clean" showed what it was going to do, but sometimes end up finding that it was not allowed to do so, which resulted in a @@ -254,6 +269,10 @@ command, and documentation was misleading. (merge cfb70e1 nd/fetch-depth-is-broken later to maint). + * "git log --all -p" that walked refs/notes/textconv/ ref can later + try to use the textconv data incorrectly after it gets freed. + (merge be5c9fb jk/read-commit-buffer-data-after-free later to maint). + * The way "git svn" asked for password using SSH_ASKPASS and GIT_ASKPASS was not in line with the rest of the system. @@ -275,7 +294,6 @@ * "git rebase --preserve-merges" lost empty merges in recent versions of Git. - (merge 9869778 ph/rebase-preserve-all-merges later to maint). * "git merge --no-edit" computed who were involved in the work done on the side branch, even though that information is to be discarded @@ -313,7 +331,6 @@ * Command line completion code was inadvertently made incompatible with older versions of bash by using a newer array notation. - (merge 50c5885 bc/fix-array-syntax-for-3.0-in-completion-bash later to maint). * Some shells do not behave correctly when IFS is unset; work it around by explicitly setting it to the default value. @@ -330,7 +347,6 @@ * t0050 had tests expecting failures from a bug that was fixed some time ago. - (merge 336e2e2 tb/t0050-maint later to maint). * t4014, t9502 and t0200 tests had various portability issues that broke on OpenBSD.
diff --git a/config.txt b/config.txt index d7ec507..c8abe86 100644 --- a/config.txt +++ b/config.txt
@@ -143,7 +143,8 @@ pushUpdateRejected:: Set this variable to 'false' if you want to disable 'pushNonFFCurrent', 'pushNonFFDefault', - 'pushNonFFMatching', and 'pushAlreadyExists' + 'pushNonFFMatching', 'pushAlreadyExists', + 'pushFetchFirst', and 'pushNeedsForce' simultaneously. pushNonFFCurrent:: Advice shown when linkgit:git-push[1] fails due to a @@ -162,6 +163,15 @@ pushAlreadyExists:: Shown when linkgit:git-push[1] rejects an update that does not qualify for fast-forwarding (e.g., a tag.) + pushFetchFirst:: + Shown when linkgit:git-push[1] rejects an update that + tries to overwrite a remote ref that points at an + object we do not have. + pushNeedsForce:: + Shown when linkgit:git-push[1] rejects an update that + tries to overwrite a remote ref that points at an + object that is not a committish, or make the remote + ref point at an object that is not a committish. statusHints:: Show directions on how to proceed from the current state in the output of linkgit:git-status[1], in @@ -534,6 +544,12 @@ variable when it is set, and the environment variable `GIT_EDITOR` is not set. See linkgit:git-var[1]. +core.commentchar:: + Commands such as `commit` and `tag` that lets you edit + messages consider a line that begins with this character + commented, and removes them after the editor returns + (default '#'). + sequence.editor:: Text editor used by `git rebase -i` for editing the rebase insn file. The value is meant to be interpreted by the shell when it is used.
diff --git a/git-add.html b/git-add.html index c44e69f..3fd66ca 100644 --- a/git-add.html +++ b/git-add.html
@@ -895,9 +895,10 @@ from the index if the corresponding files in the working tree have been removed. </p> -<div class="paragraph"><p>If no <filepattern> is given, default to "."; in other words, -update all tracked files in the current directory and its -subdirectories.</p></div> +<div class="paragraph"><p>If no <filepattern> is given, the current version of Git defaults to +"."; in other words, update all tracked files in the current directory +and its subdirectories. This default will change in a future version +of Git, hence the form without <filepattern> should not be used.</p></div> </dd> <dt class="hdlist1"> -A @@ -1289,7 +1290,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2012-09-25 12:07:50 PDT +Last updated 2013-02-04 11:21:45 PST </div> </div> </body>
diff --git a/git-add.txt b/git-add.txt index fd9e36b..5333559 100644 --- a/git-add.txt +++ b/git-add.txt
@@ -107,9 +107,10 @@ from the index if the corresponding files in the working tree have been removed. + -If no <filepattern> is given, default to "."; in other words, -update all tracked files in the current directory and its -subdirectories. +If no <filepattern> is given, the current version of Git defaults to +"."; in other words, update all tracked files in the current directory +and its subdirectories. This default will change in a future version +of Git, hence the form without <filepattern> should not be used. -A:: --all::
diff --git a/git-config.html b/git-config.html index a274da9..787c2ce 100644 --- a/git-config.html +++ b/git-config.html
@@ -1414,7 +1414,8 @@ <p> Set this variable to <em>false</em> if you want to disable <em>pushNonFFCurrent</em>, <em>pushNonFFDefault</em>, - <em>pushNonFFMatching</em>, and <em>pushAlreadyExists</em> + <em>pushNonFFMatching</em>, <em>pushAlreadyExists</em>, + <em>pushFetchFirst</em>, and <em>pushNeedsForce</em> simultaneously. </p> </dd> @@ -1460,6 +1461,27 @@ </p> </dd> <dt class="hdlist1"> +pushFetchFirst +</dt> +<dd> +<p> + Shown when <a href="git-push.html">git-push(1)</a> rejects an update that + tries to overwrite a remote ref that points at an + object we do not have. +</p> +</dd> +<dt class="hdlist1"> +pushNeedsForce +</dt> +<dd> +<p> + Shown when <a href="git-push.html">git-push(1)</a> rejects an update that + tries to overwrite a remote ref that points at an + object that is not a committish, or make the remote + ref point at an object that is not a committish. +</p> +</dd> +<dt class="hdlist1"> statusHints </dt> <dd> @@ -1998,6 +2020,17 @@ </p> </dd> <dt class="hdlist1"> +core.commentchar +</dt> +<dd> +<p> + Commands such as <code>commit</code> and <code>tag</code> that lets you edit + messages consider a line that begins with this character + commented, and removes them after the editor returns + (default <em>#</em>). +</p> +</dd> +<dt class="hdlist1"> sequence.editor </dt> <dd>
diff --git a/git-stripspace.html b/git-stripspace.html index 50d8124..af29fcf 100644 --- a/git-stripspace.html +++ b/git-stripspace.html
@@ -798,7 +798,20 @@ </dt> <dd> <p> - Skip and remove all lines starting with <em>#</em>. + Skip and remove all lines starting with comment character (default <em>#</em>). +</p> +</dd> +<dt class="hdlist1"> +-c +</dt> +<dt class="hdlist1"> +--comment-lines +</dt> +<dd> +<p> + Prepend comment character and blank to each line. Lines will automatically + be terminated with a newline. On empty lines, only the comment character + will be prepended. </p> </dd> </dl></div> @@ -857,7 +870,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2011-12-21 14:30:17 PST +Last updated 2013-02-04 11:21:45 PST </div> </div> </body>
diff --git a/git-stripspace.txt b/git-stripspace.txt index a80d946..e6fdfcb 100644 --- a/git-stripspace.txt +++ b/git-stripspace.txt
@@ -35,7 +35,13 @@ ------- -s:: --strip-comments:: - Skip and remove all lines starting with '#'. + Skip and remove all lines starting with comment character (default '#'). + +-c:: +--comment-lines:: + Prepend comment character and blank to each line. Lines will automatically + be terminated with a newline. On empty lines, only the comment character + will be prepended. EXAMPLES --------
diff --git a/technical/api-strbuf.html b/technical/api-strbuf.html index fcd20a6..5c344c6 100644 --- a/technical/api-strbuf.html +++ b/technical/api-strbuf.html
@@ -1013,6 +1013,15 @@ </p> </dd> <dt class="hdlist1"> +<code>strbuf_add_commented_lines</code> +</dt> +<dd> +<p> + Add a NUL-terminated string to the buffer. Each line will be prepended + by a comment character and a blank. +</p> +</dd> +<dt class="hdlist1"> <code>strbuf_add</code> </dt> <dd> @@ -1119,6 +1128,15 @@ </p> </dd> <dt class="hdlist1"> +<code>strbuf_commented_addf</code> +</dt> +<dd> +<p> + Add a formatted string prepended by a comment character and a + blank to the buffer. +</p> +</dd> +<dt class="hdlist1"> <code>strbuf_fread</code> </dt> <dd> @@ -1255,7 +1273,7 @@ <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> -Last updated 2012-11-15 13:11:54 PST +Last updated 2013-02-04 11:21:45 PST </div> </div> </body>
diff --git a/technical/api-strbuf.txt b/technical/api-strbuf.txt index 84686b5..2c59cb2 100644 --- a/technical/api-strbuf.txt +++ b/technical/api-strbuf.txt
@@ -156,6 +156,11 @@ Remove the bytes between `pos..pos+len` and replace it with the given data. +`strbuf_add_commented_lines`:: + + Add a NUL-terminated string to the buffer. Each line will be prepended + by a comment character and a blank. + `strbuf_add`:: Add data of given length to the buffer. @@ -229,6 +234,11 @@ Add a formatted string to the buffer. +`strbuf_commented_addf`:: + + Add a formatted string prepended by a comment character and a + blank to the buffer. + `strbuf_fread`:: Read a given size of data from a FILE* pointer to the buffer.
